From 0f8e823c9d2a87617ef414d02934af50cad13a7a Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 22 Oct 2008 16:41:33 +0100 Subject: [PATCH] Remove duplicated __cacheline_aligned attribute from irq_desc arrays Remove duplicated __cacheline_aligned attribute, as it's already included in type declaration. Signed-off-by: Kevin Tian --- xen/arch/ia64/xen/irq.c | 2 +- xen/arch/x86/smpboot.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/ia64/xen/irq.c b/xen/arch/ia64/xen/irq.c index 2c250148c5..4b79df4ade 100644 --- a/xen/arch/ia64/xen/irq.c +++ b/xen/arch/ia64/xen/irq.c @@ -74,7 +74,7 @@ unsigned int __ia64_local_vector_to_irq (ia64_vector vec) /* * Controller mappings for all interrupt sources: */ -irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = { +irq_desc_t irq_desc[NR_IRQS] = { [0 ... NR_IRQS-1] = { .status = IRQ_DISABLED, .handler = &no_irq_type, diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index d7360ec29c..4fe7d5181c 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -101,7 +101,7 @@ static cpumask_t smp_commenced_mask; static int __devinitdata tsc_sync_disabled; /* Per CPU bogomips and other parameters */ -struct cpuinfo_x86 cpu_data[NR_CPUS] __cacheline_aligned; +struct cpuinfo_x86 cpu_data[NR_CPUS]; EXPORT_SYMBOL(cpu_data); u32 x86_cpu_to_apicid[NR_CPUS] __read_mostly = -- 2.30.2